Rename XENVER_parameters to slightly more informative

XENVER_platform_parameters.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/tools/libxc/xc_private.c b/tools/libxc/xc_private.c
index e5a9c566d5de7733f8365b584f8f148aad908667..b48917ed064de28e02bccf3adbb1b0e48aad9f25 100644 (file)
--- a/tools/libxc/xc_private.c
+++ b/tools/libxc/xc_private.c
@@ -402,11 +402,21 @@ int xc_version(int xc_handle, int cmd, void *arg)
 
     switch ( cmd )
     {
-    case XENVER_extraversion: argsize = sizeof(xen_extraversion_t); break;
-    case XENVER_compile_info: argsize = sizeof(xen_compile_info_t); break;
-    case XENVER_capabilities: argsize = sizeof(xen_capabilities_info_t); break;
-    case XENVER_changeset:    argsize = sizeof(xen_changeset_info_t); break;
-    case XENVER_parameters:   argsize = sizeof(xen_parameters_info_t); break;
+    case XENVER_extraversion:
+        argsize = sizeof(xen_extraversion_t);
+        break;
+    case XENVER_compile_info:
+        argsize = sizeof(xen_compile_info_t);
+        break;
+    case XENVER_capabilities:
+        argsize = sizeof(xen_capabilities_info_t);
+        break;
+    case XENVER_changeset:
+        argsize = sizeof(xen_changeset_info_t);
+        break;
+    case XENVER_platform_parameters:
+        argsize = sizeof(xen_platform_parameters_t);
+        break;
     }
 
     if ( (argsize != 0) && (mlock(arg, argsize) != 0) )

diff --git a/tools/libxc/xg_save_restore.h b/tools/libxc/xg_save_restore.h
index ca5e51d8d4f1c289d2711f62cd1b2c631728686c..7c34fc46582be65802baec49061909f366046fcc 100644 (file)
--- a/tools/libxc/xg_save_restore.h
+++ b/tools/libxc/xg_save_restore.h
@@ -61,20 +61,20 @@ static int get_platform_info(int xc_handle, uint32_t dom,
     
 { 
     xen_capabilities_info_t xen_caps = "";
-    xen_parameters_info_t xen_parms;
+    xen_platform_parameters_t xen_params;
     xc_physinfo_t physinfo;
     
     if (xc_physinfo(xc_handle, &physinfo) != 0) 
         return 0;
     
-    if (xc_version(xc_handle, XENVER_parameters, &xen_parms) != 0)
+    if (xc_version(xc_handle, XENVER_platform_parameters, &xen_params) != 0)
         return 0;
     
     if (xc_version(xc_handle, XENVER_capabilities, &xen_caps) != 0)
         return 0;
 
     *max_mfn =     physinfo.total_pages;
-    *hvirt_start = xen_parms.virt_start;
+    *hvirt_start = xen_params.virt_start;
 
     if (strstr(xen_caps, "xen-3.0-x86_64"))
         *pt_levels = 4;

diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c
index e2585dc5edca6ec01c0277c0eb493fad92bae612..3283ca74e5eb5990ba086123aaf47383e76bf406 100644 (file)
--- a/tools/python/xen/lowlevel/xc/xc.c
+++ b/tools/python/xen/lowlevel/xc/xc.c
@@ -721,7 +721,7 @@ static PyObject *pyxc_xeninfo(PyObject *self,
     xen_compile_info_t xen_cc;
     xen_changeset_info_t xen_chgset;
     xen_capabilities_info_t xen_caps;
-    xen_parameters_info_t xen_parms;
+    xen_platform_parameters_t p_parms;
     long xen_version;
     char str[128];
 
@@ -739,17 +739,17 @@ static PyObject *pyxc_xeninfo(PyObject *self,
     if ( xc_version(xc->xc_handle, XENVER_capabilities, &xen_caps) != 0 )
         return PyErr_SetFromErrno(xc_error);
 
-    if ( xc_version(xc->xc_handle, XENVER_parameters, &xen_parms) != 0 )
+    if ( xc_version(xc->xc_handle, XENVER_platform_parameters, &p_parms) != 0 )
         return PyErr_SetFromErrno(xc_error);
 
-    sprintf(str,"virt_start=0x%lx",xen_parms.virt_start);
+    sprintf(str, "virt_start=0x%lx", p_parms.virt_start);
 
     return Py_BuildValue("{s:i,s:i,s:s,s:s,s:s,s:s,s:s,s:s,s:s,s:s}",
                          "xen_major", xen_version >> 16,
                          "xen_minor", (xen_version & 0xffff),
                          "xen_extra", xen_extra,
                          "xen_caps",  xen_caps,
-                         "xen_params", str,
+                         "platform_params", str,
                          "xen_changeset", xen_chgset,
                          "cc_compiler", xen_cc.compiler,
                          "cc_compile_by", xen_cc.compile_by,

diff --git a/tools/python/xen/xend/XendNode.py b/tools/python/xen/xend/XendNode.py
index a1275dc47fe2caeaf1ac759f93197c0bf61ca2c5..fc0accd7d18aca631ab6352554163b4eefd825b2 100644 (file)
--- a/tools/python/xen/xend/XendNode.py
+++ b/tools/python/xen/xend/XendNode.py
@@ -75,7 +75,7 @@ class XendNode:
                 ['xen_minor', xinfo['xen_minor']],
                 ['xen_extra', xinfo['xen_extra']],
                 ['xen_caps',  xinfo['xen_caps']],
-                ['xen_params',xinfo['xen_params']],
+                ['platform_params',xinfo['platform_params']],
                 ['xen_changeset', xinfo['xen_changeset']],
                 ['cc_compiler', xinfo['cc_compiler']],
                 ['cc_compile_by', xinfo['cc_compile_by']],

diff --git a/xen/common/kernel.c b/xen/common/kernel.c
index c0fee4298b624ca29c9b2c397ab6392b9c153955..9975ee639d880d8ecb1a95498dba096f30201a73 100644 (file)
--- a/xen/common/kernel.c
+++ b/xen/common/kernel.c
@@ -124,10 +124,12 @@ long do_xen_version(int cmd, void *arg)
         return 0;
     }
     
-    case XENVER_parameters:
+    case XENVER_platform_parameters:
     {
-        xen_parameters_info_t info = { .virt_start = HYPERVISOR_VIRT_START };
-        if ( copy_to_user(arg, &info, sizeof(info)) )
+        xen_platform_parameters_t params = {
+            .virt_start = HYPERVISOR_VIRT_START
+        };
+        if ( copy_to_user(arg, &params, sizeof(params)) )
             return -EFAULT;
         return 0;
         

diff --git a/xen/include/public/version.h b/xen/include/public/version.h
index 80489adcd1c4ed04e66157d446d950afb18dbdcc..d22566e38112d0dbca96affe523b33b99706ea1f 100644 (file)
--- a/xen/include/public/version.h
+++ b/xen/include/public/version.h
@@ -34,10 +34,10 @@ typedef char xen_capabilities_info_t[1024];
 #define XENVER_changeset 4
 typedef char xen_changeset_info_t[64];
 
-#define XENVER_parameters 5
-typedef struct xen_parameters_info {
+#define XENVER_platform_parameters 5
+typedef struct xen_platform_parameters {
     unsigned long virt_start;
-} xen_parameters_info_t;
+} xen_platform_parameters_t;
 
 #endif /* __XEN_PUBLIC_VERSION_H__ */